bug fixes
fixes picker bugs