comment cleanup, stack adjustment
re-added deleted header :(
re-added struct to deleted header :'(