Added more documentation and some extra options