improvements, fixes, update names