Fixed some CS and headers