Found some bugs in code, tried to fix them, have list of problems but ca...

...n fix now