consume improvements, player fixes, tinker armory import