replaced confusing _ALL defines; fixed percentage not printing;