Fixed broken specs and added some quick wins