Try to make some sense of the crazy world which we live in.. and fix file handling bugs