Refactoring H2STUB, and update TODO list and alternatives