Feature/updates

Fixes for #1, #2, #3, #4, #5