added couple fixes