updates mostly powerline
merge