add fixtures, bug fixing