fix colors, start to add bug