Comment shit and fixup