More work and fixes