subtler credits & a few optimizations