lots fixes