tweaked some stuff