2013 Oct 13 - many bug fixes