Find croup file at first check instead of init

Also some minor fixes