Fix lots of bugs & warnings

And adapt to change in Leonie's instruction tables by using the right macros.