updated submodule and fixed some referencing
updated files