Fixed things and added real pieces