minor tweaks
comments, timing code