bugfixes and first version of assembly control