more code

moved decorator back into function
added more robust generic parsing and paging
implemented renewals