Merge pull request #2 from colorbitch/master

tidy models
fixed back end
Merge pull request #8 from colorpeach/master

fixed back end