applied more tweaks to fix + fixed space bug