[WIP] Many more fixes