Add signal handler
Fix tab bug
Cosmetics