Bugs 41 42 43

Fixes #41 
Fixes #42 
Fixes #43