update: code and view updates

Fixes #6