method params and locals + minor fixes