fixed naxi flag, items mostly work, cleaned up look