Added some style
just taking care of some todo items, and adding a few...