Bug fixing and standardisation