1st pass audit of Wirish

Some updates and changes to Wirish, but a lot remains