More level gen work, general fixes