Fixing check and adding new ones.