fixed bugs juliana mentioned