Code rearranging, few sprites added