Added my PR's and fixed some things