some minor functional edits

let me know if these are kosher
changing it back