Changed a few things. Waiting for xcomp to help fix my work environment