Bugs fixed again, demo M4 and M5 successful