Many fixes. It all works. Mostly