Add Functional subpackage, minor changes