Bug fixes, signal added