fixed oath error. added todos