Fixing errors

More of that. One more week and grad school is a wrap...