Fix bugs, update specs