Version bump
Rework code & fix issues after gathering feedback
Cleanup API code