added gui controls and related tweaks