Improved Switching among Temporally Abstract Actions