Fixes for handling timing issues with Sidekick manipulation
Organized imports
Added comments and housekeeping
Updated server handling selection and comments