Soft23 WIP, some bugfixes
Bugfixed, still WIP