fixed bugs 12, 13