added caravan, integrated into playstate
assorted fixes and cleanups