Better controle over instructions. Fixes #145.