Fixed 2 bugs and added 2 more to the  log