Fixed some minor errors and naming conventions
Updated README