fixed a few lines that didn't compile in last commit