Shell setup, itch file, little refactoring.