almost finished cavalieri
fixed typo and almost finished cavalieri