Updated GAL and some code debugging