[0.0.5] - Clean up code and fix minor bugs