Sorrows End: Bug fixes

All reported bugs fixed, removal of unintended leftovers from pre release.