cleaning up the data model, making initialization cleaner
some rendering fixes