Some fixes and outline for next steps