Small updates and new functions