a lot of updates. Fixes #1, #2, #4, #8, #9, #10, #11