Issue/445 446 449 455

Fixes #445 
Fixes #446 
Fixes #449 
Fixes #455