Closes #264 #263 #262

Fixes #264 
Fixes #263 
Fixes #262