syntax cleanup & owdir enabling