[WIP] Squash missed Weight/Volume system bugs

Marking this **WIP** because it needs some additional testing.. I want to make sure I catch every bug I can with the new weight/volume system.