Fix bugs
Be more liberal
Remove debug output