Minor fixes. Sample molecules works for example water2.