broke up some long lines and added some missing colons