more rake improvements