Small bug fixes and GUI changes.