Fix a few errors and prep for go live