fixes
fixes in progress, incremental commit