Bug fixes/streamlining (v0.5.1)