fix all changes in this bundle
changes after fixing cs stuff