Minor frame, functions and addon fixes.