Changes necessary for backend with widget to work together.

bugs killed