more configurations
more fixes