some fixes in rush, + single cs files