Fixed Many Bugs