Contributions from andig

The following changes were made by andig:

• selection configuration options
• setSelection API function
• general code cleanup
• removal of dead code