[FIX] Many bugfixes