merge an some fixes