Feature

lots of style changes