Model diagram and little fixes that don't seem to work