minor edits and removed more swp files