Fixed some Bugs BB