Fix, typo and new functions