I think this should pretty much wrap up the piano roll bugs...