Minor updates to get rid of some bugs and improvements

Also removed logger