Minor modifications to debug output, consistency on source code writing and modified the lang filter to be more strict.