Made Better checks

also added in ids for some things