fixes. Get things to a working state