A few more fixes. Things are coming along nicely