Feature low hanging fruit

Fixes #38, #40, #41, #42