Commented more stuff