Methods parameters attributes added, minor fixes