tweaking some stuff