Fix saving/loading. Also minor logic tweaks
Bump version to 0.1.1