Cleaned up some stuff and added more to /count