some fixes
Code is complete YAY!