Some changes to correct minor bugs in a clean install from new github repository.