Solver : fixing build issues, coding complete