Do a bunch of fixing of things

Refactored a bunch of code and made mucking_about_files use fib