Fixed grass bug and organized names