some clearing
minor changes