minor updates to previous commit, shoulda waited