Added GPL and minor changes