Clean up errors, final touches on v.0.1