cleaned up compiler errors to this point