bunch of tweaks, sorry, i some how just forgot