Added update check, minor fixes