A lot of stuff has been improved. But still some exceptions