Final pubish, some error rectification