Fix some problems with architecture merging

Should hopefully fix everything in #109. Also more commenting stuff