(fix) touch up and styles

Get the latest  from Collin's team page