adding new spinner. general cleanup.