Minor v.0.6 Changes