making some controls
more changes