aesthetic changes and some perf boosts
additional tests for record class