few things tweaked