fixed a bunch more compiler errors.  maybe it will run this time