Several functionality updates