fixed dumb porting bugs i did