small tweaks - not there yet