added a couple fixes