fixed most of the features, now green, now in the start to fix rspecs