Fix some bug in p15
Finish p16