Heh, sorry about another notification, played with some rebasing and then reverted to a much earlier version and cherry-picked some commits..