Submodule update. Some code improvements.