A little refactoring and some SignShop updates.