Fix many more bugs and added another configuration