Some copy/paste bugs corrected