add some vanir things and update to current aokp on some things