- fixed some more bugs (by maarten :P)