final auction pieces and some code cleanup