Update to correct bugs. 

Update to correct bugs and allow user to set more complicated parameters for John.