Some more comments and import fixes for the currently edited files in Desktop