seperating us_helper.h into more pieces
minor fixes