Fixes & adds new specs