add commentary, update manifest for ubuntu
merge changes