Minor refactor
Fix break down of large requests, update for new cipher-aes128