Niceties

Latest libraries; naming; faster.