Working on 1.0.0

At a point where minor improvements and bug fixes are coming in.