removed TODO comments and put them into Issues on the github page