misc modifications