Various Issues

Fixed header formatting