minor tweaks - still fucked up
minor tweaks