updates from ghoulpop

pull from ghoulpop