Make a bunch of modifications

Haven't commit for a while