Some style changes, and fixing some issues from the list.