some tweaks after I started using it

..