tweaks, switching to barebones asap