Cleaned up some mistakes.