some fixes this time