updates, fixes, improvements