Standardization, fixes, tests