More updates to picky.py