Fixed a bit and found some Bugs (->will fix soon)