Several changes to data, javascript, model generation