v. 0.24 contd, typo fixes, performance tests, minor refactor/optimisation