Bug fixes

Solves the following issues among other things:

#13
#12
#8 - It's OK to assume