merge

Minor stuff changed and stockmayer-state file fixed.