fixed small stuff I broke with the merge. Forgot that I made changes to mater at home...dumb....