Commented a few more functions