Updated javadoc header and removed some todos