Fixed 148.paa and small code improvements