review & bugfix