color changes + fixes