Fixed owner bug, added more to properties