Fixing some bugs, creating some bugs