Updated header and small fixes