fixes + added public methods