Fixed remaining errors. Program works again.