Cleaned up prior changes, fixed strcmp(), and test.