Fixed loose ends. All SQA issues have been resolved as of this date