Quick fixes and a more serious start on setup

Works towards #12