added a few, renamed a few