Style changes and additions

changed some minor things as well