git ready to merge hlmk
minor chages to hlmk stuff