headers added, other minor style changes