[Fix] Many Bugfixes