WIP: update demogs, fix small BUGs