fixed all number checks