fixed Bugs, added one