new functions, fixes, etc.