fix + code tweaks