More sdbization for comments and hints (-250LOC)