options: add colors
minor cleaning