switch use list and other bug fixes