renaming
fix specs
on work
fix, better documentation and better errors