Fixed most outcommented stuff