Updating signatures, re-doing functions, and added comments