small cahnges and tweaks