more changes from danmane