updated with missing fixes