fixed somethings from porting over files