some minor changes + failed attempt to set default vars