reversing changes and changing develop environment
fixing some stuff