almost complete TODO:comments and adjustments