@ Environment: Grid*.cs hot-fixes but the project is a totall messed-up going for cleaning...