All tested and fixed