edits; removed improve this
Merge branch 'source' of github.com:distributedlife/p2 into source