model system cleanup
more model cleanup, beginning forms and settings