Finally fix many smaller issues!