some final cleaning to get ready to merge and added an important comment to address the bug and the gitissue that I made (note that the current code works, but its not idea that it does it the way it currently does it, the gitissue should be addressed eventually)