some style changes, slowly pullingit together