cleaned up model changes; fixed startup errors