GWA & some fixes