Fixed some bugs and adedd other L2 cases