Fixed General Bugs