Fixing some Bugs

Sorry come back later in like a one week or else contact me