A few small changes, Comments and TODOs added, some changes to the weapons made