few bug fixes, color changes