Updated Weaknesses + Cleanup