Tightening and tweaking


git-svn-id: http://es-lab.googlecode.com/svn/trunk@741 aeea10e6-ec39-11de-83d8-6d5adf01d787