add more specs and fix some stuff