Fixed most problems