more fixes to piece