Some fixes and updated configuration!