Edit master

General cleanup.