Update #1.2
- Cleand up a bit