Removed soem Bugs