[ some fixes ]