just moving NONSTANDARD things to the end of the struct, seems to work now, may I reintegrate it into master? relates to #118 #114 #117