Overhaul paper plane entity, still needs much work