added todos and fixme