Updates to picky.py