Fixed all Vitalis' corrections