Updates and error fixes