Mild tweaking / camera prep / add wifi bits