Made fixes + working on specs.