minor improvings/fixes and identing