in the middle of adding and realigning fields and correcting variable names, things are sloppy