cleanup, new functionality
func updates