bunch of changes including parts of new pet system

because pets are awesome duh