Started logging stuff and some more comments