Added GLPv3 and tided up

Mainly house keeping no real code changes