Fixed some things and added some things.