many little fixes preping for deployment