Fixed some stuff and config