bug fixes along with widget modifications.