adding a little color, and some rake fixes