fix static things and typo