improved comments and todo