added data_shape
bug fix
bug fixing
minor changes