Fixed a few bugs and reduced amount of logging