Improve size and add docs