Changed things here and there...

Fixed a few Bugs and rewrite some Functions...