Fix incorrect script dir and fix comment count