more minor tweaks
close to working