Bug Fixes and Code improvements 0.1.6 bump soon