Final model clean up
Version 0.4 complete 020920114