updated todos
deleted swap files
Improved input format verification