Added more model numbers; cleaned up getting model names