fixed some spaced and headers