added jade with patch
fixes, watcher initials, improvements