part4 make stuff
Fix some bugs.
Some tweaks while debugging.