Generic update

Updated some logging measures, removed code that isn't used, did some basic system fixes.