Bug fixes

Fixed cursor bug in the Remove function. All cursor functionality should
be working properly now.