more fixes and so on, everything should nearly work now