initial fixes of things talked about