cleaned some code, added admin model
merge