some fixes, improvements, updates ...