Getting setup on a new machine, style bug fixes