Bug fixes
Implemented 'Remove' action, other minor tweaks