Some small changes; fix file path etc.