Comming changes from a few weeks back.

Lost track of things, might as well commit.