some object selection fixes and co.
some object selection fixes and co.