#336: rollback changes, small improvements