corrections to make and fixing up inclusions and stuff