syntax changes, function fixes, cleaning up, prettifying, general data format finally established