minor improvements, rearranging examples