Milestone 1 issues

Fixes #138, #136, #132, #131, #129, #123, #120, #117, #112, #107