Various tidy-ups, and mouse button clickery!