style fixes, criteria page fix, FIXME comments