kwargs passing and minor typos