Fix parameter handling, update readme
Update readme with class-level annotations