just some nice tweaks and table this for now