Some fixes but still borken