Commit 30

Fixed selection problems