added remove override in parameter select, fixed a bug with tokens
fixed few bugs