url should still be set to this repo, also, if you could separate this into a pull req for each feature that'd be great. thanks for contributing!