Bugfixes + new Bugs found

References won't work.
+ Bugsearching..