Rot corrections and additional functionality