Added TODO in README, fixed bugs