a lot of bugfixes from testing.
finished planning
start of comments