Major streamlining, minor improvements and bug fixes (v0.3)