Model updates, fixes for hector