Fixed some bugs 2013-04-24.