major style changes and additional funcitonality