Some bugfixes. Added move() semantics somewere.