fix styling issues and a few specs