bugfixes+weapons table