Copyright update
Cleaning up kwargs and moving wait to params