Fixed some horrible bugs (but still needs an overhaul)
Authored by: vladr 2001-06-10
Parent: [r144]
Child: [r146]
