ack complete
fix some TODO