Fixing model properties

Should #99