Updated to latest version - fixed some bugs and error messages