1.5.3

Minor optimisations and bug fixes