@dbeltran some fixes for IDE issues. One possible bug needs more care, the ohters are mainly comments and typos.