Added GCM support, minfixes