Include better identation and fix events