Few Fixes, weapon tables started