Removed environment specific parameters, fixed several bugs