more tweaks
made it work