add fixtures, small changes