wanafon updates

great work jlord!