Fixed some things and added some more