fixed some model problems added some view stuff