AD fixes and additions

picked from:
https://gerrit.omnirom.org/#/c/5824/
https://gerrit.omnirom.org/#/c/6173/
https://gerrit.omnirom.org/#/c/6290/

Thanks omni dudes

Signed-off-by: dragon <dragon7780@hotmail.nl>