Corrent typo-s based on THWIT feedback