Updating several bug fixes