finish charging and fix olli's shit