minor fixes and improvements due to changes in code/folder structure