Caught some minor issues, now fixed.