clean up and updates to 1.0.4