7th draft

mostly style changes