minor goldplating and issuefixing