CRM-13965-qa-fixes : some major improvements and #5 issue fix mentioned in comment by dgg after the initial QA round