fixes for mobile-org

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
big update

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>