Updated manifest and bug fix