Renaming and more debugmsgs