pulling new stuff
committing merge
fixed zoom and some colors