Fixes to torches and entities

See commit descriptions :)