fixes to original