Various updates and fixes to imports and property location forms etc.