fixing validation errors
Merge branch 'design' of github.com:richardshaver/mpate into design
make things pretty