few testing tweaks
view clean ups