Version 0.1.2 - Various Bug Fixes + Code Cleanup