More Functions Debugged and Tested