Moving logging lists, fixing comments, moving code to it's rightful place