- Command interface improved
- cleaned code a littler