A few more additions and optimisations.