Started fixed some bugs