Minor fixes and clean up
Update core version to 0.0.12