Fixed Bugs (multi fixed!)

Just fixing bugs (again). Ah, and added some stuff.