more rake tweaks