Updates from nwcAndroid

Hope that's everything ><