various unfinished changes