Minor fixes, also spawneggs sort of work now...