Removed files with suffix ~ from being tracked, fixed area calculation bug