Added some log info and errors