regular update, some fixes