Code cleanup
Decrease timeouts to troubleshoot EF load issue
EF timeout troubleshooting
Fix return on successful save
Fix look ahead enumerator logic