fixed stage2 bugs, ready to release.