Fixes #46, fixes #45, fixes #44, and fixes #41 all pickem updates