Fix/optimize all the things