Minor improvements and tidied up .inp files