Bug fixing and HLAWP