More improvements to Batman