-various fixes