Continued fixed some bugs and better logs.