- minor bugs fix
- clean up