Changed some stuff for the development environment