more h$ renaming and some fixes