Fixes for issues, and some more selection stuff