prop updates and fix