working on last tweaks