Bug fixes, interface improvement.