Optimisations and list bug fixes