bugfix + added setter methods + renamed methods