Updates to fix a number of issues in unicorn.py