clean up coffeelint complaints, and fill out edit form some more