did some checkstyling and javadocing
removed test, no longer relevant.. we may want it back, but only a few lines of code to add
reformatted instruction_index and properties
fixed merge conflicts