fixed some stuff, added move functions