fixed Bugs. have fun