fixed final bugs before upload to App Store and integrated nico changes.