Finish off refactoring.
Fix property issues.