Fixed/added some things