testing stuff
fixing some bugs