added models, fixed URL stuff