updated todos
fixed specs