IT IS DONE

Lots of bug fixes, no time to write