bug fixes with removing from list