Add header + some fixes