Merge bug/syncing

Addresses #60, #49, #55 

Touches #46