Extended documentation / usage and renamed some vars