committing latest error fixes