merge stuff into WIP branch

updating WIP with changes from Master, ignore this.