Fixed all known bugs. Verified working with hiera