some fixes and observations