fixed some bugs, changed color scheme