ahem, fix some stupid mistakes...