fixes & resubmit for 1.0