Minor changes to method names and comments.
Changed license info (Not sure which License will be used yet). Also, removed an unneeded kwarg.