Add specs and some polish