Hirestack design improvements

by Mitko Yugovski