Various fixes, version header update