some new updates, renames, etc.
removed debug