added more rules etc
small bug fix - not sving in classic