-Added some more rules to prevent bad mistakes