Fixing bugs, getting up to 1.0