fixed some more issues, till-28