addressed most of Steve and Mike's edits