indent
update libraries
fix calculateMatrix bugs
update