Fixing several bugs - (executing first extreme SQA plan)