couple of minor model and admin changes plus a bunch of test data