replace some constants by imported ones; add TODO notes