Comments handle, optimisation and fixes.