some design teaks