small fixes, incremental commit