Turned properties into functions and fixed other Xcode 6 beta 6 issues.