more small bugs fixed.  Making it futher with finished structs through iteration 2