#92 debug junk removed. one function changed place and became static