removed ~ files and few other minor changes