Port: small fixes and refactorings

converted some methods to properties
Merge, cleanup