Summoned By Accident: 25.04.08 Bugfix 2

Various bug fixes