Add some comments
clean up TODOs and reference jiras