Add switch info, some other minor changes