fixed bugs 10-11-2013