October 2, 2013 - Some error fixes