Ok, adding another problem.
The battery drain issue is somewhat related to wifi.
Before sleeping the other night the battery was on around 30%, woke up to a dead phone.
The following night the battery was on 89% (1am), when I woke up it was on around 60% (8.30am).
The night after, was on...