Fixing bugs + renaming ...