some slight tweaks