lotsa additions and edits