added some issues/TODOs in source