fixed TODOs, declaration of position structure