first packet of bugfixes (but simple get working! :-D)