Putting static back for functions, correcting text