- fixed rename issues
- small cleanup