lots of bugfixes, WIP on comments, will finish tommorow