Fixed some general silliness