Comments and small fixes. shuhh...
title