updates and deletions, tweeks to style