Minor cleanup
Clean up windowwidget
Cleanup FIXME comments