Small additions, mostly unfinished