Minor changes to installation and setup