did some renaming & bug fixing