Fixes, Cleanup
Improvements, Fixes #25