more corner case tweaking and temporary work