Removed Problem 24
Appeased WArnings