removed unneeded dependency
changed to common naming scheme
minor spelling changes
work in progress
work in progress