fixed biggest problems from first push