fixed bugs 9,11-15