blarg
fixed conf
fixed conf
rebase fix
added stuff