updates, still many memory issues to debug
updates, still more debugging