fixed bugs breena reported