more updates nearly done mobile