bug fixes mostly, made the pieces numerated