Progress & minor error checking