fixed configs + tested some more