Implemented fixes from testing