Edited some bugs