Switched all references to long attributes.
Fixes a lot of the lag issue... so far at least.
Merge remote-tracking branch 'origin/master'