missed some commits?

there are some fixes and senseful changes