A lot more fixes and configuration files