Clean up, style fixes, settings fixes and better error handling
New model syntax
Version bump