Added environmental components and fixed move bug