Fixed some filenames and loose ends