Multi-armature support and small fixes