A few more updates and fixes. Pretty much ready to go.