updates, documentation, better message