final edits for addon mode & some fixes