Summoned By Accident: 25.02.08 Bugfix 1

Various bug fixes