lots of updates, switched to using bourbon and neat