powerline & other changes
merge