5th try
some fixes