Some things fixed, still problems