tweaked some stuff a bit