org update merge, player spawn + bug fix