small tweaks. Added work to be done tomorrow