lotsa fixes