more kwargs and documentation