minor performance hacks, todo notes