compile errors fixed, hopefully