more tweaks / added comments