general code updates