improve aliases and update spec
fix docs