fixed conquerList logic, cleaned up notes