added colors, fixed some queries