fixed bugs
all specs passing