Several subtle fix, mostly code markup