Cleanup some verbose logging
Fix out-of-bounds slicing