minor improvements to make the picker work in other projects