directory change and small updates