Fix some style issues, extra includes, setting the signal name.