fix token bug
part stacking, metadata improvements