some changes-n-stuff