Work

Work around compiler issue with initializing static local variables.
Added a few more features.