minor modifications regarding internal data structures