Bug fixes. Typos. Added controller retry logic