Cleanup, Weapons and Syncing improvements