Some carrying capacity inspection code
Misc. changes. Nothing important.