updated header with forum link, did some other small merges