some more fixes and changes :P