Bugfixes
Beginning of instruction handling