v 0.2.0 - core cleanup - FIXED AND WORKING