Few cleanups, change to setup script to include branch