Updates from wiki; trimming some more duplicated code