Update

Multiple selections, small fixes.