A lot of last-minute fixes, version 0.1.1