fix spinner and add # and @ handling