* formatting
* add missing include's