* many small changes and fixes