fix skrollr timing issue. fix some todo