Bug fixes and widget enhancements