More Undescore, some fixes