Fixed swapping between files

Also removed some echos and alerts