some small changes, still some bugs (i.e. view does not refresh